From: alex-z <blackslayer4@gmail.com>
Date: Wed, 24 Apr 2024 22:19:59 +0000 (+0200)
Subject: Bugfix. E2EE. Always migrate from 1.2 to 2.0, even with nested folders.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~2^2~70^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=a83a6362733a598dd039d25cd708d68e0e38be5a;p=nextcloud-desktop.git

Bugfix. E2EE. Always migrate from 1.2 to 2.0, even with nested folders.

Signed-off-by: alex-z <blackslayer4@gmail.com>
---

diff --git a/src/libsync/foldermetadata.cpp b/src/libsync/foldermetadata.cpp
index bef57f92e..3a32daa73 100644
--- a/src/libsync/foldermetadata.cpp
+++ b/src/libsync/foldermetadata.cpp
@@ -955,15 +955,7 @@ bool FolderMetadata::isRootEncryptedFolder() const
 
 bool FolderMetadata::encryptedMetadataNeedUpdate() const
 {
-    // TODO: For now we do not migrated to V2 if a folder has subfolders, remove the following code and only leave "return latestSupportedMetadataVersion() > _existingMetadataVersion;"
-    if (latestSupportedMetadataVersion() <= _existingMetadataVersion) {
-        return false;
-    }
-
-    const auto foundNestedFoldersOrIsNestedFolder = !_isRootEncryptedFolder
-        || std::find_if(std::cbegin(_files), std::cend(_files), [](const auto &file) { return file.isDirectory(); }) != std::cend(_files);
-
-    return !foundNestedFoldersOrIsNestedFolder;
+    return latestSupportedMetadataVersion() > _existingMetadataVersion;
 }
 
 QByteArray FolderMetadata::certificateSha256Fingerprint() const